Patch Fixes

1/2