Some fixes by broff