Some fix to build the daemon