More feature fixes