Better limits for the conventional scenario (and more debugging)