couple of fixes for smoketests