Fixed problems that emerged when gitflow got messed up.