Misc fixes from Fifthel.