COOK-3636 Fixes from Travis build