Fixes, Cleanup etc