fixes to make flymake complain less
another todo