Several fixes for the catalogue