Fixed some 'none' checks