More error fixin'