Sam Enabling feature fixes