Small fix and tweaking