Some misc cleanup