Fix of minor issues