[#523] Toolkit update and other fixes