couple of fixes

I have been working over my own repos to build 4.3, might help with a few things. Thanks to all of teamliquid!