More fixes

going to bed…3am