Fix minor changes