Fixes for ada-mode