More checks on max_age passing