Minor cleanup and fixes.