Casey/George fixes