Minor control changes.