Fix build errors 2