Fix a couple of issues