Few small improvements