Fix regression (show window title width > frame width) and minor changes