Adding some changes advised by scrut