Updates to threading code for UHCore