Fix 1.6 compliance issues