More fixes related to drop-down conversion