ERT-564 Fix max values for variables