more csd fixes