Few fixes before deploying to server.