Fixes and Cleanup