Bug fixes to user