Fix build errors?