More minor clean up