Fix EoL stuff