Batch of minor changes