WOW-SRP fixes. Not sure I found all, this is a mess.