More fixes to get this working
More fixes