compiler errors on Solaris Studio removed