some fixes, python3.3+ seems broken right now