Fix crashes on web1-dev1 reported by Charlotte