Fix build

[akurtakov]

Merge as build suceeds but with failing tests. Still better than not being able to compile at all.