Fixed bad location of squirrel stuff... maybe a failed merge