[fix] Apply some tweaks to reflect changes introduced in 2db5a046