Edit client issues corrected