Portability fixes for errors test-suite