Fixed a few remaining bugs related to reload and input focus