Fix access methods for upstream keys