Fix build errors 2 (hopefully)