fixed more derps. compiles for 1.6 now