minor fixes to cleanup
Merge remote-tracking branch 'origin/adrian'