Small fix and improvs