Merge "Fixed warnings during compilation"