Concurrent exceotion fix, as well as other fixes