Weasel fixes