Bug fix for None type and hack for stdlib