misc wsh fixes