Update some stuff for CFX