Fixed reported bugs