Fix compile error
Fix another compile error
also do this the same way in 3.2.54