Fixed indicator category removal; other minor fixes