small compatibility changes