More fixes for K4W