More fixes following review