Bug fixes
Cleanup