Fix single line and eob problems