A few further changes