Fixes by Ole