Small improvements with Jesse