Fixed some features