Build warnings bugfixed