Fix some of the commands not working, let's hope this doesn't mess up.