Fixing more stupid little errors