Payment assign fixes