Trival bug fixes by Kushal Das 2016-12-01 Fixed two trival bugs.. #1558169 & #1502814 for releaseforge.