Addressed diff comments by japaric