Fix a couple of issues with previous commit