cwm config fixes