3.7.1: fixed requires and shoved them into on_load