Improved bytecode compatibility