Fixed issues with default checks