Fixing a few more things