Various corrections

Various corrections...