Additional compatibility fixes for Robot Framework 2.8+