Few more small changes