Clean up and fixes.