More (temporary) kwalitee fixups