Fix some new features