Minor cleanup tasks