Add upstream for fixes