Additional compatibility improvements