Fixes for WHS