v1011 Minor fixes