Final patch for serials planning bugs