Fix some case where OnLoad wasn't called