XPAND contains an option W(ater scrutinizer): is it water, or is it a small cation, or perhaps even ammonium ? XPAND tries to figure out for you if your waters could perhaps be something else, using simple distance criteria on nearby atom types, plus the number of them. Don't know yet if this is useful.