Fixed reported bugs.