Minor cleanup fixes