Fix issues, eliminate most Xcode warnings
Flush states on PF block starting