Make stuff work under 3.3