More 0.6.5 support