Fixed things in BE, BP and WildWeed