Minor fixes + subscription override attribute