More 5.3 compatability fixes