Fix CS and doc issues