Trim the extra patch number
Appease Hackage by removing -Werror