Minor improvements on reload logic.