Made stuff work on SPARC HW