Fixes for fatal errors on production