Various cs fixes