Second batch of corrections