Ironing out Solaris related bugs