Fixes from review
Fixes from review

mbuttu/butter,robinparadise/videoquizmaker,mbuttu/butter,BBGInnovate/butter,BBGInnovate/butter,mbuttu/butter,robinparadise/videoquizmaker,mozilla/butter,mozilla/butter