Some fix and updates