Fix internal helpers for 2.6.18