Merge "Fixed compile warnings" into main