Fixup option conflict and import error