Re-enabled indicator, minor changes