Fix compile errors, @mproncace can you check what is really to do here?