Changes to compile on fleet master branch. [Waiting]

Not compatible with current fleet 0.6.2 though