cs fixes for #163