Made some fixes for easier deploy.