Fix minor differences between Blue Eagle 3.0 and 3.1