Fix for formatting and demo stream source.