Minor updates to fix indicator