Small fixes for running from vocms20.