Fix the goofs