[DW-738] - Attempt to fix less compilation