fixes and updates for cfx