Fix some stuff  v2