Minor changes to get us closer to working threads.