Fixed failing features