I still have some Spain in my back pocket, but let's first talk about a negative outcome of the increased security rules at the airports.
I am sure you have noticed how brutally the airport shops and cafe's are abusing the increased security regulations to their benefits. Why else would you have to pay about 3 Euros for a small bottle of water or soft drink?
They are fully aware that people come through the check without any liquid and are likely to need some. Heck, you are recommended to drink at least 2 dl of water per hour on a flight and most people also tend to drink a lot of water during the day anyway...
Naturally the airlines are also adding their spice to the soup and - in their tight financial situation - minimizing all extra costs like free drinks onboard.
In Finland you can strike back at least a bit:
Take an empty bottle with you and fill it in a toilet after the check-in. The tap water has been tested to be cleaner than bottled Evian ;o)