Fixes for community feature