Changes to compile on fleet master branch.

Not compatible with current fleet 0.6.2 though
Merge pull request #12 from catalyst-zero/fleet-master

Changes to compile on fleet master branch. [Ready]