Adding fixes for merchant