Fixing broken api changes