Small fix and cosmetics