Fix a couple of fails