Fixing a few errors...