Fixed some things in features