More small changes

More small changes