Improve 3.3 support