fix build problems with 5.3