Minor fixes based on real-life encounter with Cloudbees (AISAB-56).