Fixing a lot of issues brought up by acceptance tests