Minor fixes for better compatibility with KDevelop