Remove trailing whitespace from some files
Fix more Solaris compilation problems