Another fix, and 3.3 build