Fix import errors

Merged Lionel Morin requested to merge fix_errors into dev

Merge request reports