Cosmetics

Various minor fixes