Partner fixes