Initial small changes.