Trying to fix CS errors