Changes for when Emacs is built without X