4D compatibility improvements