Some minor clean ups