make things work on SunOS
19 files changed