More fixes... Think it's done this time!