Plan map fixes