Add some minor adjustments

Fix CS

Fix CS

Fix CS