Patches to prevent decompile errors