Misc sigma fixes.