Minor cleanup stuff