[Mason] added more skip fixes