ISPN-374 Minor fixes after review