fix up imports, reflection warnings
1.1.1