Improvements when switching between overlap modes

#244