Lock modules in standards.make, various fixes