Add minor quota-related fixes