MOAR fixes for layer integration