Fix thread issues with Otto