A few days of small misc changes