Address review comments from @Osmose