Build warnings fix