fix a bunch of failures