Fixes, cleanups