Verious fixes for WHQL

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>