Changes for compatibility with current streams master