Some minor clean ups...