Some minor improves