Fixed issues on admin collaboration