Merge fixes (to verification)