Fixes, primarily for script loading sequence