Various fixes. The scripts now don't raise an exception on load… ><