Switch some missed require stml to use stml2