some weasel fixes