Cleanup fixes.