Updating more commits that got lost (from May 9th)