Fixes for indicators