Some minor fixes: Unexpected end of input.