Fix Solaris warnings/errors

Modified an unmodified file to make it look like the original