Fixed compilation errors in emacs 24.2