Improved use of sun.h