ModelLibrary::some input system fixes