Few small fix