Niels-specific minor things.