more indicator fixes