[nim, kelvin] #45 Fixes smoke tests