Trying to fix the failing builds