Couple dirty fixes to get running on 3.3