New feature fixes