updates for hopeful CI build on check-in