Fixing merge-issues from HWH purge