Output lock fixes.