b2 - engine fixes