Minor changes to ArchPlan