Fix shallow flash issues when using master