Made changes to avoid warnings (Windows compilation).