Changes required to close issues #721, 1271 and 1272