Fixed some Kwalitee complaints