Fixes/Cleanup