Clean up of minor issues