Fix a couple issues with rw-emms that caused emacs to misbehave