CFY-768 fixes and workarounds