Emacs 24 Migration Part 3

- Minor fixes