Fixes, cleanup