Add compatibility endpoints

...and some other thing I forgot to merge in from before?