Build warnings fixed