Product admin fixes