make everything compile and tests succeed, except for one legitimate issue