A few improvements for future Leo airdrops