Bustage fixes

That looks all sorts of wrong, I love C++ compilers