Manually resolve the Widoco-related issues

Cf. https://github.com/dgarijo/Widoco/issues/577