Apply some fixes needed for current xojo compiler.