fixes for changed integration