Includes term was broken, plus compilation fixes.