Minor fixes and improvements

Pulling Commit