Applied small improvements