compatibility improvements