Addressed cloudbees issues