Another wash/wax should take care of that. Most paste wax products have a release agent that should get those water spots out.