Couple of buxfixes