More carddav fixes