Smaller manual fixes.