Fix for upstream api changes