Merged Lars fixes.