small lwi changes