minor define and fact fixes