Fixed some things because of some failing cfml tests