Fix issues with multi-instance loading