Couple of fixes to make selenium slightly closer to working