merged in warnings changes