Fixed more build errors.