some more OP hardcoding fixes

Description

some more OP hardcoding fixes that I missed earlier.

Assignee

Unassigned

Reporter

James Duley

Labels

None

Fix versions

Priority

Configure