Some fixes with users and orders