Couple more changes to make the selenium tests work