Minor patching up