More build fixes in opcodes