Couple of things fixed (TODO language select)