More fixes/tweaks for Bug#4035.