envelope fixes