Added fixes for Output to console.