Minor cleanup updates