OpenSolaris edits