Minor fixes following review