Updated the #2 patch with #3 issue fixes.