Forgot some items in CheckCapacity()