Various minor cleanup