Quick fixes for the deploy