Cleanup
Fixes after testing