Updating version and fixing sonar issues