Fixups in line