start fixing 5.3 support after getting a test box