Fixing ci builds failing