More work towards thread-safety