ci failures fixes