Fixed issues raised through KDE reviewboard