Some errors patched