A few additional changes