Bux fixes

Things have never been better.