fixing some more non-failures