some fixes to silence emacs 24.4 byte compiler