Cleanup + fixes
Merging fixes