Small cleanup

This commit provides some small cleanups, that fixes
some QtCreator complains.