Address felixcat comments.