Fixed some errors for 5.2