Minor changes during implementation of first setup.