A few minor clean ups