Fix Quality flaws
Defer bytecode completion