Fix some small tweaks Arne suggested