Fixes for acceptance tests.