Fixed Patches

Resolved issues with patches