fixes to operations.xql and related modules