More minor bux fixes