Added patch options for both libraries