Tiny fixes around 'required switches missing' exception