Cosmetic bugfixes

Created new branch for these commits as we decided to look again at the changes for Pinta 1.6 (https://github.com/PintaProject/Pinta/pull/61). I needed this in order to be able to continue working on master without mixing up things so much.