Fixed 5.3 errors