Fixed some stuff locally (Evan)