Some changes related to comments of @lstrojny.