Some misc cleanup.