Minnor fixes
Other minor changes
Bug fix and other fixes