Current member fixes