entries and map fixes