merge patches from pfsense manually
fix errors