BPHY20: Some fixes
I've not seen any problems empirically but when reviewing this code (!50042 (merged)) I noticed this could have unwanted side effects so I add some flags and protection.
I've not seen any problems empirically but when reviewing this code (!50042 (merged)) I noticed this could have unwanted side effects so I add some flags and protection.