More Gunnar fixes.