BEF fixes

#2533, #2552, #2541, #2548