Andrew, I think you are probably correct in thinking the plant with yellow flowers is Fenestraria.
I looked for Fenestraria in the index of THE MEDITERRANEAN GARDEN and found that it is mentioned in number 52, April 2008 in MY WOODEN ROCKERY by Bob Wright