Patch some lousy mistakes I made.