Apply some fixes needed for current xojo compiler.
Merge pull request #157 from declaresub/master

Apply some fixes needed for current xojo compiler.