Fixed problems with the default gap settings