Several fixes in references