Added missing checks to enable K4W support