More fixes here and there