Some minor adjusts