Small fixes for csync2