Fix some import and arg name problems