Moar changes for winbugs