Fix XML errors, add remote "mk"