fix some confusing and untestable feature definitions