Small fixes to be able to compile