Merge more stuff from Anders