Some compatibility changes, by no means final