Fix ownership + improve message