Fix payment issues