Revert "Revert "emergency fixes?""

This reverts commit d8ee6ec33415d4e6d55e7cbd6c61870e42c534d3.