Fixes & Cleanup