fix bugs unfixable at the other branch