Cleanup, improve default tolerance which was too lax