Fixing two really stupid errors in my previous commit