some fixes for when operflag is enabled

Jobe more testing