Added some more tweaks for the new sun/oracle systems