Cleanup
Fixes