Cleanup + manual fixed