Fixed #5745 and a few other items discovered during testing
Fixed #5745 and a few other items discovered during testing

ptorsten/pfsense,jxmx/pfsense,pfsense/pfsense,phil-davis/pfsense,dennypage/pfsense,ch1c4um/pfsense,ptorsten/pfsense,ptorsten/pfsense,NewEraCracker/pfsense,pfsense/pfsense,pfsense/pfsense,NOYB/pfsense,NewEraCracker/pfsense,BlackstarGroup/pfsense,BlackstarGroup/pfsense,dennypage/pfsense,NOYB/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,jxmx/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,jxmx/pfsense,NOYB/pfsense,pfsense/pfsense,dennypage/pfsense,brunostein/pfsense,dennypage/pfsense,phil-davis/pfsense,brunostein/pfsense,ch1c4um/pfsense,phil-davis/pfsense,brunostein/pfsense,NewEraCracker/pfsense