Final needed flattening fixes to fix build under new star