patching up patching troubles

Just a couple small issues from the refactoring