Some small bags fixed