I have pushed out a version 3.52-pre1 which has these workarounds (untested) in it... Please test it out and let me know if it does the job. -hpa