Fix solaris errors/warnings

Fix solaris errors/warnings