Fix issues that Trond found.