Minor bux fixes