Fixes found while integrating on ci