WSWT Fixes