More bib caps fixes