fixes on warehouse and logical

fixes on warehouse and logical