RR: some tweaks to support deployment to UAST server.