Two minor bug fixes exposed by Linux/Jenkins.