Fixes by @attilaolah