more fixes for SunOS