Fix a few bugs, lol