Various minor clean-ups