Try to fix building failures