Some minor fixes
Some minor fixes