Small issues

Fixes a few of the smaller issues in the QiiTa-pet issues.