More small cleanup stuff