fix a bunch of failing smoke tests