Wt4 update

Compatibility issues and cosmetics for Wengen Test 4