Patching up minor bugs