Various minor clean up