Few small tweeks