Also fix some reentrancy issues in the controller_load functions.
Attach a file by drag & drop or click to upload
