Fixed problems with references after move of client