Small update for config build and bugfix for wm settings