fix a couple of @samccone's nitpicks