Can someone with commit access have a look at tickets 5446 & 5654. They're small, still apply cleanly to trunk, and I've been running them for the last few months without problems. Thanks Neil