More strict.lua work and resultant fixes