Fixed problems with None being defined as PP symbol