Last valret fixes