Fix errors for skipped acceptance tests ...

... and other minor issues I noticed.