Various corrections