Started fixes from email