Some fixes and new key "CleanupTarget"