Fix build errors'