Fixes, clean up