Two minor fixes for production (Bos)

@jar398 , I thought we might try to push these to production (Bos) since we're in our scheduled maintenance window: