Fixes warnings for emacs 24.3