Support Python 3.3
Small fixes