Fix build errors attempt