Address additional comments from @normanmaurer