Improved the checks to be a bit more forgiving to types, given that they are covered by other checks