3A42a: Some issues fixed with indications.

@shisoft You should really tag yout commit notes with version number so
that it will not confuse us.