Small Fixes and Cleanup