Made the thing compile on 3.1