More minor clean-up