misc fix to get build happen