Cleanup + small fixes