Yup, all taken care of. I'll test the "solution" in a few weeks when some friends come to visit.

Cheers!