Some minor changes, trying to push to clever-cloud.