Committing Tesla fixes