Fix compilation for master