20140920 - Misc cleanups