Minor fixes: quicklooks, with_mask test

Mishmash of commits; it would be better to split these but they are one-liners and I'm preoccupied; I'm sure more will come up before tomorrow's done.