Fixes, cleanup.