Applying some cs fixes