Minor cleanup of objects