Scripted loading & other fixes