Fixed warning and broken tests on 3.3