window map fixes