DF BPC minor fixes