Fix 5.2.1

Various minor fixes.