Upstream and resource path fix