Some minor modifications