Updated patch with changes addressing issues identified