Fixing callback and other typos