mos and config fixes