Fixes and cleanup

...again