Various on-load behaviors fixed