Another batch of WI fixes