Some fixes
Cleanup