More nasty local hackery