a couple of fixes for smoketests