Fixed compile errors for the new 1.6.2 update