Address comments by @normanmaurer