sunstudio fixes