Some minor bug fixed