Fix 2.6.32.61 compile issues