Fix 0.9.2

I've tried compiling latest mesos storm and had some troubles. This PR resolves most of them.