Try the revision posted above--2008.1.13--and see if that resolves both issues for you.