Improve input loading. Handles cases where input loading has been forgotten.