Fixed a few more Kwalitie issues