[Anton] Bug fixes