WELT2000 fixes

Trivial clean-ups.