Some fixes incurred for dropship