Bug fixes and default avatar