Let ModelType options override env, fix imports