A few bug fixes

We had some variables set not in an OO way