Few more small touches