Fix a couple of issues pointed out with my initial PR