Fixes for acceptance tests