New bugs fixed