More fixes for integra framework