Further client perm tweaking