Fixed unreported bugs.