Address comments by @wasade