Minor fixes (try to make the canonical solution more simpler).