Fixes for online tests.