Merge Trond's bugfixes