CS and packages fixes