Fix Warehouse Validation