#724 Fixing issues identified in comments from @rashidkpc