Different fixes by broff