Some eirgrid fixes and other tidy ups