Fix some remaining old-style stg id calls