Some minor fixes and updates
Some minor fixes and updates