Minor Fixes and cleanup