Three small changes related to deployment of OTT 2.4

These changes are not related to one another but are so small I thought I'd submit them as one batch.