Cleanup, fixes.