Cleanup. Some fixes.