Minor fixes and comments