Multi-aka fixes