Minor fixes following testing