Minor tweaks bundle including https://github.com/elifesciences/lens/commit/e957cdabecaaea9e76f25f9bb493e341dbbbef63