Fix some other random stuff I forgot in the last commit