Grass Rivulet, and possible Spruce Carpet

I found this very pale Grass Rivulet in the garden trap from last night. Only the second time I have seen this moth.

After some pondering, I have gone for Spruce Carpet for the moth below, but happy to be corrected.

Steve Trigg, Cookham