Misc Cleanup & Fixes.