Cleanup + fixes