Skip checks on solaris, support old export