Further updates following Foundation's move to Boot 1.2 snapshots