Hammering out annoying edge cases