Output bug fixes