Few tiny changes