Somehow these got in the merge, maybe I messed it up?

@kbenne can you look to make sure everything was merged correctly?