Minor bustage fixes for bug 1037609 and bug 1037100.  r=bustage

--HG--
extra : rebase_source : 72083f1ec1036497a4d6a93ee614ea60794ae749