Merge "fixed some issues from sonar"