[B.A.T.M.A.N.] Various fixes and clean-ups