Remove a warning, fix toplevel compilation
Fix tests