Fixed some other features