Various minor updates throughout