Cleanup and Fixes