Linux changes to handle presence/absence of 'check' better