Fixed some more failing features