Initial changes after script/bootstrap.