AF 5.4 fixes for member processing