morePlanning fixes