follow and map fixes