Fix number of minor issues