commits to fix build/check failures