Fix some issue with envelope durin init