Added small fixes on user