Fix some features