Small compatibility changes