Tolerances fixes for the front end