Output performance fixes