wpi - (experimental) fixes