Fix to make scripts sourceable again