small improvements for tricky regions