Fix a couple of stuff