Make compile with recent changes
Fix compilation