Cleanup and simple fixes.