Fix build

This branch fixes the build.

It includes one fix I am not so sure.