General Fixes and Cleanup