Fix Thorfile and load order