diff --git a/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake
index 503e135..715da96 100644
--- a/cmake/modules/FindLibVNCServer.cmake
+++ b/cmake/modules/FindLibVNCServer.cmake
@@ -38,4 +38,4 @@ ELSE (LIBVNCSERVER_FOUND)
   ENDIF (LIBVNCSERVER_FIND_REQUIRED)
 ENDIF (LIBVNCSERVER_FOUND)
 
-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
\ No newline at end of file
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
diff --git a/framebuffers/xcb/xcb_framebufferplugin.cpp b/framebuffers/xcb/xcb_framebufferplugin.cpp
index 5e01c66..0efa4b1 100644
--- a/framebuffers/xcb/xcb_framebufferplugin.cpp
+++ b/framebuffers/xcb/xcb_framebufferplugin.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
- @author Alexey Min <alexey.min@gmail.com>
+ Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public
diff --git a/krfb/connectiondialog.h b/krfb/connectiondialog.h
index 229185c..9988b2d 100644
--- a/krfb/connectiondialog.h
+++ b/krfb/connectiondialog.h
@@ -59,7 +59,7 @@ class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget
 {
     Q_OBJECT
 public:
-    InvitationsConnectionDialog(QWidget *parent);
+    explicit InvitationsConnectionDialog(QWidget *parent);
     void setRemoteHost(const QString & host);
 };
 
diff --git a/krfb/framebuffer.cpp b/krfb/framebuffer.cpp
index 3ec9de7..5eef1b5 100644
--- a/krfb/framebuffer.cpp
+++ b/krfb/framebuffer.cpp
@@ -9,7 +9,7 @@
 
 #include "framebuffer.h"
 
-#include "config-krfb.h"
+#include <config-krfb.h>
 
 #include <X11/Xutil.h>
 
diff --git a/krfb/invitationsrfbclient.cpp b/krfb/invitationsrfbclient.cpp
index fa958e2..1a27be0 100644
--- a/krfb/invitationsrfbclient.cpp
+++ b/krfb/invitationsrfbclient.cpp
@@ -65,7 +65,7 @@ PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
 
 void PendingInvitationsRfbClient::processNewClient()
 {
-    QString host = peerAddress(m_rfbClient->sock) + ":" + QString::number(peerPort(m_rfbClient->sock));
+    QString host = peerAddress(m_rfbClient->sock) + ':' + QString::number(peerPort(m_rfbClient->sock));
 
     if (d->askOnConnect == false) {
 
@@ -126,7 +126,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
 bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     QByteArray password ;
-    qDebug() << "about to start autentication";
+    qDebug() << "about to start authentication";
 
     if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
             InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
diff --git a/krfb/invitationsrfbserver.cpp b/krfb/invitationsrfbserver.cpp
index a650568..cee6224 100644
--- a/krfb/invitationsrfbserver.cpp
+++ b/krfb/invitationsrfbserver.cpp
@@ -115,8 +115,8 @@ void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
 
 InvitationsRfbServer::InvitationsRfbServer()
 {
-    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
+    m_desktopPassword = readableRandomString(4)+'-'+readableRandomString(3);
+    m_unattendedPassword = readableRandomString(4)+'-'+readableRandomString(3);
     KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
     m_allowUnattendedAccess = krfbConfig.readEntry(
             "allowUnattendedAccess", QVariant(false)).toBool();
diff --git a/krfb/krfb.kcfg b/krfb/krfb.kcfg
index 29aefba..c1699f5 100644
--- a/krfb/krfb.kcfg
+++ b/krfb/krfb.kcfg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM
-    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-<kcfg>
-  <kcfgfile />
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name="krfbrc"/>
   <group name="MainWindow">
     <entry name="startMinimized" type="Bool">
     <label>Start minimized</label>
diff --git a/krfb/mainwindow.h b/krfb/mainwindow.h
index 945ec91..9f2939e 100644
--- a/krfb/mainwindow.h
+++ b/krfb/mainwindow.h
@@ -8,8 +8,8 @@
    version 2 of the License, or (at your option) any later version.
 */
 
-#ifndef MANAGEINVITATIONSDIALOG_H
-#define MANAGEINVITATIONSDIALOG_H
+#ifndef KRFB_MAINWINDOW_H
+#define KRFB_MAINWINDOW_H
 
 #include "ui_mainwidget.h"
 
diff --git a/krfb/rfbclient.cpp b/krfb/rfbclient.cpp
index 3da8c36..28775db 100644
--- a/krfb/rfbclient.cpp
+++ b/krfb/rfbclient.cpp
@@ -43,7 +43,7 @@ struct RfbClient::Private
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
     : QObject(parent), d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + ":" +
+    d->remoteAddressString = peerAddress(d->client->sock) + ':' +
                              QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
diff --git a/krfb/rfbclient.h b/krfb/rfbclient.h
index 5fbe048..4b3b02d 100644
--- a/krfb/rfbclient.h
+++ b/krfb/rfbclient.h
@@ -97,7 +97,7 @@ protected:
     virtual bool checkPassword(const QByteArray & encryptedPassword);
 
     /** This method checks if the \a encryptedPassword that was sent from the remote
-     * user matches the \a password that you have specified localy to be the password
+     * user matches the \a password that you have specified locally to be the password
      * for this connection. This assumes that the standard VNC authentication mechanism
      * is used. Returns true if the password matches or false otherwise.
      */
diff --git a/krfb/sockethelpers.h b/krfb/sockethelpers.h
index 6635f48..74f64cf 100644
--- a/krfb/sockethelpers.h
+++ b/krfb/sockethelpers.h
@@ -20,6 +20,9 @@
    Boston, MA 02110-1301, USA.
 */
 
+#ifndef SOCKETHELPERS_H
+#define SOCKETHELPERS_H
+
 #include <QString>
 
 QString peerAddress(int sock);
@@ -28,3 +31,4 @@ unsigned short peerPort(int sock);
 QString localAddress(int sock);
 unsigned short localPort(int sock);
 
+#endif