various buxfixes