Minor changes during site creation