Fix and small improvements