Warehouse tweaks

Brad had some nits