Staging - GUI fixes for upstream