cfx2 changes and other minor stuff