Fixed issues with member removal

Also workshop blocking~!