Fix for #428
Fix for #346 && #375
Fix for #385
Merge pull request #436 from mozilla/all-the-bugz

All the bugz