Minor changes to Thor