Added a number of other issues