FIX: Issues when deploying to server