Fixing a few errors