Some minor bugs fixed
Some minor bugs fixed