Cleanup + build fixes