Fixes around amber and multithreading.