Fixed reported issues