Fix issues with py33