Fixing a couple of problems from the last upload